From 14e3695f9e53efa17066b59addcca413f9070167 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 18 Sep 2017 17:25:54 -0400 Subject: [PATCH] mkhex: Move it to tools/misc It makes more sense to put a tool to be used by other subsystems to be in 'tools/misc' along 'mkrpm','mkdeb', etc. The patch titled "xen/livepatch/x86/arm32: Force .livepatch.depends section to be uint32_t aligned" uses mkhex. Acked-by: Wei Liu Suggested-by: Julien Grall Signed-off-by: Konrad Rzeszutek Wilk --- tools/firmware/hvmloader/Makefile | 8 ++++---- tools/{firmware/hvmloader => misc}/mkhex | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename tools/{firmware/hvmloader => misc}/mkhex (100%) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 7c4c0ce535..a5b4c32c1a 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -91,23 +91,23 @@ roms.inc: $(ROMS) ifneq ($(ROMBIOS_ROM),) echo "#ifdef ROM_INCLUDE_ROMBIOS" >> $@.new - sh ./mkhex rombios $(ROMBIOS_ROM) >> $@.new + sh ../../misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(STDVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new + sh ../../misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(CIRRUSVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new + sh ../../misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(ETHERBOOT_ROMS),) echo "#ifdef ROM_INCLUDE_ETHERBOOT" >> $@.new - sh ./mkhex etherboot $(ETHERBOOT_ROMS) >> $@.new + sh ../../misc/mkhex etherboot $(ETHERBOOT_ROMS) >> $@.new echo "#endif" >> $@.new endif diff --git a/tools/firmware/hvmloader/mkhex b/tools/misc/mkhex similarity index 100% rename from tools/firmware/hvmloader/mkhex rename to tools/misc/mkhex -- 2.30.2